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
	GoliathGame/GoliathGame/GoliathGame.vcxproj.filters
	GoliathGame/GoliathGame/Town.h

Town is in right now it doesnt do anything yet but it will take you there after the three rooms we have now then wait 5 sec it will take you back to the start