cause the Gemfile.lock is complaining
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development
Toan | Updated signup page
fixed merge conflicts