rails 4
Merge pull request #1 from kritik/master

update to rails 4