Initial commit with creation of a Rails application
Solved merge conflicts