delete test.haml file after testing
Merge branch 'master' of https://github.com/alukima/SurveyGorilla into amy_dexter