Merge pull request #8 from lisafeather/karan

Minor copy fixes
add some CSS and a link to the users basic_info form
some layout changes
changed some copy
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
new layout for homepage
merging with master
add database.yml to gitignore
Merge pull request #9 from lisafeather/bootstrap_index_view

Bootstrap index view
footer
Fixing merge
not sure what is going on, but stupidly commenting the  code until the views work