added discover link on home page
fixed foursquare login
adding to gitignore
adding to gitignore
removed env files
Merge pull request #13 from gregburton/master

User creation, log in, and log out all working. Ran migration to remove username field from Users table. Added Mapbox gem.
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #14 from dheckman/master

added dicover link on homepage, fixed foursquare login with correct keys
gitignore changes
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	.gitignore
added logins controller test, users controller test, user model test