some local changes to save
Merge branch 'master' of https://github.com/coyotes-2014/survey-sparkling-unicorns
testing
fixed a signup bug