initial rails 4 upgrade
Merge pull request #3 from WIZARD221/rails4

initial rails 4 upgrade