Eh
Merge branch 'master' of http://github.com/ritwikd/supership3000-dev

Conflicts:
	Game.cpp
Fixed FPS cap - also implemented "Q" to quit.