Added testing text for Tank's new BitmapText class
Changed graphics code to reflect engine changes
Merge branch 'master' of github.com:Gazok/Stranded
Removed some dependencies again.
Added missing stdexcept includes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Engine
.gitignore updated to include ycm
Merge branch 'master' into nonQtEvents

Conflicts:
	.gitignore
	src/Engine
	src/MainState.cpp