Upgraded Rails to 4.0.4
Merge pull request #35 from cathydeng/upgrade_rails

Upgraded Rails to 4.0.4