Add map and style form
Merge branch 'master' of https://github.com/Novapo/homepage

Conflicts:
	app/views/layouts/application.html.erb
	app/views/pages/index.html.erb