Added more to map
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/app.js
	styles/style.css