resolved merge conflict
map pretty much ready to go
merge
cleaning up bits
sliced events on chapter page to limit of 4
merged remote master
merging mapPhase2
fixing spacing and moved header and footer to layout stylesheet
updating map js
merged master to have updated map
Merge branch 'master' into responsive

Conflicts:
	app/assets/stylesheets/home-page.css.scss
	app/assets/stylesheets/layout.css.scss
	app/views/locations/show.html.erb
Merge branch 'responsive'