Entity collision with walls and things
Merge branch 'master' of https://github.com/SyntaxBlitz/apcs-2014-final