rails upgraded to version 4
Merge pull request #1 from vsych/rails4

rails upgraded to version 4