first commit
Merge branch 'master' of github.com:sicilijan/test-rails