Add nav
Merge branch 'master' of github.com:brettshollenberger/terribletracker

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