Replaced rough items with finished items in tent
Merge branch 'master' of github.com:HarbingTarbl/GGJ2013

Conflicts:
	assets/TentArea/flashlight.png
	assets/assets.contentproj
	src/States/TentState.cs