rails initiated
Merge pull request #1 from iliastsangaris/master

rails initiated