Begin scene 3 context
Add location info
Merge branch 'master' of github.com:theefer/gu-2030

Conflicts:
	app/index.html
	app/styles/main.css