tag model and join table for notes/tags created
removed join table, put it on branch
removed unneeded items
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
using acts-as-taggable-on gem for tags
tags being put on notes in console.  added form to rambles page, but routing is currently incorrect
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
merging before switching branch
merging branch
conflicts
git add -f app/
Merge pull request #47 from Noahhh/master

git add -f app/ because everything was crazy
added mapbox links to head
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
adding more ignored files
edited gitignore
Merge pull request #48 from Noahhh/master

fixed gitignore
added basic mapbox map to discover page
resolved merge conflicts with files in views/notes
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru