Initial rails boilerplate commit
Fixed conflicts