add some CSS and a link to the users basic_info form
Merge branch 'master' of github.com:lisafeather/silverFit

Conflicts:
	app/views/layouts/_navbar.html.erb
	app/views/users/basic_info.html.erb
try to fix merge conflicts
merging with master