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
added ramble name form on create and ramble name edit on show
Merge pull request #85 from Noahhh/master

added ramble name form on create and ramble name edit on show
Merge pull request #84 from dheckman/master

	redirecting user back to discover page after login
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/layouts/application.html.erb