Nothing
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/Debug/GoliathGame.exe
	GoliathGame/Debug/GoliathGame.pdb
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
Fixed my shitty code to be less shitty
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/Debug/GoliathGame.exe
	GoliathGame/Debug/GoliathGame.pdb
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
	GoliathGame/GoliathGame/GameState.cpp
Worked on ways to makes the tiles better not done though