Final stuff...
Something in the merge messed somesome stuff up. (Yay for specificness!)
Merge branch 'master' of https://github.com/kuykendall-benjamin/School-Project-KNKG

Conflicts:
	src/application_states/GameState.java