navigation links
Merge branch 'master' of https://github.com/ryanvchu/finalProject

Conflicts:
	peer-evaluation-app/app/views/layouts/_navigation_links.html.erb