fixed conflicts head merge to master
Merge pull request #326 from ndomar/fixing_samy_head_gemfile

fixed conflicts head merge to master