Worked on grid/entity rendering
Merge branch 'master' of https://github.com/mibewh/seniorProject.git