update
changed top bar to allow current user
added nav back in
got foursquare auth to work with regular sign in
Merge pull request #15 from dheckman/master

foursquare auth not breaking with greg's user signup
changed nav around
merged
removed nav links from index and added them to application
Merge pull request #16 from Noahhh/master

Changed top bar around
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

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