the commit
Merge branch 'master' of github.com:Dioralop/railsapp

merge test