Added new place.
Merge branch 'master' of https://github.com/schickling/room-tour

Conflicts:
	places.js