nav work
Merge branch 'master' of github.com:spilliton/luckypennyfund

Conflicts:
	app/views/devise/registrations/new.html.erb