#google maps
Merge remote-tracking branch 'leo/master'

Conflicts:
	index.html
	js/app.js