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

Conflicts:
	GoliathGame/GoliathGame.sdf
Commit
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
Commit
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
Commit
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath
Pushed in parsing for the different level sizes
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
Got parsing of sizes of level sections in.