Getting jsons fixed
Merge branch 'master' of https://github.com/freshSTCH/HackRice14

Conflicts:
	Rooms/4.png