first commit
Merge branch 'master' of github.com:siman-man/rails4test