commit 0
Merge branch 'master' of github.com:andreios/RoR_test