Initial rails build
Merge conflict