Clean up Entity constructor
Merge branch 'master' of https://github.com/SyntaxBlitz/apcs-2014-final.git