Work on stuff.
Merge branch 'master' of github.com:mscarter/GGJ2014_IDungeon

Conflicts:
	Assets/Scripts/RoomState.cs