Merge branch 'master' of http://github.com/tcsullivan/gamedev

diff --cc main.cpp
Simple merge

diff --cc src/entities.cpp
Simple merge

diff --cc src/gameplay.cpp
Simple merge

diff --cc src/world.cpp
Simple merge