added validations to ramble.rb
cleaned up code on rambles index page
adjusted styling on discover create form partial so that button is one same line as location input
pre-merging Dani's ramble creation fix
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/discovers/_create.html.erb
re-added lat, long, destination variables back to API calls in rambles controller
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/controllers/rambles_controller.rb
	app/views/discovers/_create.html.erb
set default zoom level for mapbox map using setZoom([14])
set default zoom level for rambles map as well
Merge pull request #75 from Noahhh/master

Put relevant notes on discover page & added a show/hide function for them.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/assets/stylesheets/discovers.css.scss
	app/controllers/rambles_controller.rb
	app/views/discovers/_create.html.erb
	app/views/discovers/show.html.erb
	app/views/rambles/index.html.erb
	app/views/rambles/show.html.erb
added top and side navigation
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #76 from dheckman/master

added top and side navigation
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/assets/stylesheets/application.css.scss
Merge pull request #77 from gregburton/master

Updated maps, API calls, made discovers creation form inline
changed class to fix display:none error