I don't even know anymore
Merge branch 'master' of github.com:The-Fighting-Mongooses/seven-bridges

Conflicts:
	GameEngine.cpp
Fix warning
Less segfaults
It works! Sort of.
It works! (all the way)