Disable autocomplete in form_for forms
Add links and navbar
Add text boxes
Merge branch 'forms'
Merge conflict resolution
Merge branch 'master' of github.com:nkabrown/prolific

Conflicts:
	app/views/users/show.html.erb