small adjustment to nav
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
redirecting user back to discover page after login
merge conflict in application
Merge pull request #84 from dheckman/master

	redirecting user back to discover page after login