reworked navigation
Merge branch 'master' of https://github.com/servemoore/pairs

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