fix gemfile.lock issue
Merge branch 'master' of https://github.com/folieadrien/easyrails_website