new surveys button
Merge branch 'master' into new_surveys
added nav bar to layout.erb
Merge branch 'master' into new_surveys