Merge branch 'master' of https://github.com/mnipper/rails_survey
Shift regex and option columns over one
Merge branch 'master' of https://github.com/mnipper/rails_survey into develop