Changed naming scheme for member variables, added makefile, implemented setters and getters
Merge remote-tracking branch 'upstream/master'
changed player class to GameObject class
removed render.hpp
merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from zxcdw/master

Merge your fork with the main project