Renaming files to gameengine and fixing a few other issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	LudumDare30/src/StateManager.cpp
	LudumDare30/src/main.cpp