Merge pull request #23 from gregburton/master

Added logins/new.html.erb back after it disappeared with a previous merge. Added some (currently non-functional) tests for logins controller, users controller, user model.
commit before merge
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
added instagram call and displaying single image on discover page
merged
Merge branch 'dheckman-master'
removed env file temporarily
Merge pull request #25 from Noahhh/master

Merged Dani
new env file
updated gitignore
updated gitignore
Merge pull request #26 from dheckman/master

new env file
using HTTParty to call reddit api, now showing subreddits of durham on discover page
Merge pull request #27 from dheckman/master

using HTTParty to call reddit api, now showing subreddits of durham on d...
added logins helper back in to allow for standard user login