terrible merge
update Gemfile
dos2unix
easy_captcha