added files (related to rspec and notes views) that were not being updated due to extra * in gitignore
resolved merge conflicts with files in views/notes
rebuilt the 20141124021621 migration
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/.DS_Store
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/notes/_note_form.html.erb
	app/views/notes/create.js.erb
fixed issue where I couldn't log out user
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/.DS_Store
	app/views/notes/create.js.erb
added gem nifty-generators
removed nifty-generators gem as it did not work properly
generated location scaffold for use with geocoder
geocoder is working to print out lat-long based on providing address through locations form. next step will be to link it to an API so that it can take an address, convert it to lat-long, then pass the lat-long into the API request
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
did some cleanup on discovers show page; namely removed the javascript tagging code that we are not going to use since we are going a different direction with tagging
Merge pull request #55 from gregburton/master

Added locations; geocoder working but not yet interacting with APIs
fixed merge conflict
fixed merge conflict