merge conflicts
Merge branch 'master' of https://github.com/s-loar/Divvy_Up

Conflicts:
	app/views/layouts/application.html.erb
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
Merge pull request #31 from s-loar/tour_index_page

tour index and some styles
maps working, but no marker
Merge pull request #32 from s-loar/maps

Maps
pushing to master
asdfl
changes to seed
points work!
Delete 0144c24f72bb9e62d5f9554081d3a095
Delete 01df99be28c3eba0229e0b0848f0e5ef
Delete 085a52f545008ffbf10845bf6fbfeff8
Delete 0c5a27cc98b61045506cf00986f6790a
Delete 0d9a625ef86dd97d24c6d6f043f8c5a7
Delete 0dbac4bdc0f1569dee8dc25bb2f76472
temp_bg
Merge branch 'master' of https://github.com/s-loar/Divvy_Up
More seed data
another pull down with crap files