Navbar links
Recent doodles path
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/doodles_controller.rb
	config/routes.rb