My local copy of application.html.erb was not update to Survy's changes, combined his and my changes