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

Conflicts:
	GoliathGame/GoliathGame.sdf
Still working on tiles should be done soon
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath
Added some testing code in for the parsing
Debugging