Barebones Rails new app
Fixed merge conflict