Merge branch 'daily-routes'

Conflicts:
	Gemfile
	app/assets/javascripts/gps_coords.js.coffee
	app/controllers/gps_coords_controller.rb
	config/routes.rb
Deleted overview html erb.
Merged Readme Info.
Merge branch 'master' of https://github.com/DeusExMachina/map-diary

Conflicts:
	app/assets/javascripts/gps_coords.js.coffee
	config/routes.rb