update git ignore
Merge branch 'master' of https://github.com/mnipper/rails_survey
migration
merge