Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
pulled from master
working on logins
foursquare and standard login/logout working properly
merging
Merge branch 'dheckman-master'
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #19 from Noahhh/master

Merged from Dani
updated env
updated env
added yelp to initializers and created very basic search
merged master
mapping out user profile page
user profile mapped out
Merge pull request #21 from Noahhh/master

User Profile page mapping
started mapping out note search page
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #22 from Noahhh/master

Started mapping out note search page
users controller and .env pre merge
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	config/initializers/.env
	config/initializers/omniauth.rb