Added therubyracer gem
Resolved conflicts in Schema