Changed some stuff in Game
Merge branch 'master' of github.com:HarbingTarbl/GGJ2013
Started integrating the first area (tent)
Merge branch 'master' of github.com:HarbingTarbl/GGJ2013

Conflicts:
	assets/assets.contentproj
	src/G.cs
	src/States/BaseMemoryState.cs
Merge branch 'master' of github.com:HarbingTarbl/GGJ2013

Conflicts:
	src/G.cs