homepage map linking to discovers page, added deletion confirmation back in
merge conflict
notes placeholder working, added conditionals for api calls in discovers controller
updated ramble delete on rambles page
Merge pull request #148 from gregburton/master

work on API section of ramble page, adding environment variables to API calls, fleshed out readme, cleaned up gemfile, decluttered ramble and discover pages
merge conflict
updated delete button
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #149 from dheckman/master

homepage map linking to discovers page, added deletion confirmation back in, notes placeholder working, added conditionals for api calls, updated ramble delete on rambles page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/assets/stylesheets/rambles.css.scss