Added phases to RoomState.cs
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon

Conflicts:
	Assets/Scripts/RoomState.cs
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon
Cleanded up assets
Fleshed out character selection menu
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon
Character Selection cleanup
Merge branch 'master' of http://www.github.com/mscarter/GGJ2014_IDungeon