Huge checkin. Will now start doing incremental checkins.
Merge branch 'master' of https://github.com/trotlinebeercan/lsp

Conflicts:
	CMakeLists.txt
	source/Camera.cpp
	source/Camera.hpp
	source/GameEngine.cpp
	source/GameEngine.hpp
	source/GameState.hpp
	source/Math.hpp