Updating JSON
Merge branch 'master' of https://github.com/jbierfeldt/university-virtual-tour

Conflicts:
	json/tour_stops4.json