nav styles
Merge branch 'master' of https://github.com/bcroesch/perky

Conflicts:
	app/assets/javascripts/perks.js.coffee
	app/views/perks/index.html.erb