Improved makfile, various fixes
Merge remote-tracking branch 'origin/Implement-GameLoop' into Implement-GameLoop

Conflicts:
	Makefile