Navigation bar
Merge branch 'master' of https://github.com/BaconRemovalUnit/CSC210Project

Conflicts:
	app/views/home/welcome.html.erb