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

Conflicts:
	GoliathGame/GoliathGame.sdf
commit
added in a fix to the tilesheet.