Initial commit; boilerplate Rails app
Fixed merge conflict