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

do not use this it is out of date
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
	GoliathGame/GoliathGame/GameState.h
	GoliathGame/GoliathGame/Level.h
	GoliathGame/GoliathGame/Room.cpp
	GoliathGame/GoliathGame/Section.cpp
	GoliathGame/GoliathGame/Section.h
Made the calls for the near tiles take in baseobjects
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/GoliathGame.sdf
Nothing