merged
Merge branch 'dheckman-master'
Merge pull request #26 from dheckman/master

new env file
.env
.env is there
Merge pull request #27 from dheckman/master

using HTTParty to call reddit api, now showing subreddits of durham on d...
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added logins helper back in to allow for standard user login
working on note form for rambles
removed rspec gem, added rspec-rails
Merge pull request #28 from gregburton/master

added logins helper back in to allow for standard user login
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added rspec-rails to test and development groups, bundle installed, rain rails generate rspec:install to initialize the spec directory (where specs will reside)
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
notes on rambles working
touched up some notes
working on JS for note refresh
notes on ramble working, JS working as well
Merge pull request #30 from Noahhh/master

Merge troubles fixed.  Added notes to rambles page. Added a little JS to make notes add without page load.
merge conflicts