Initial commit base rails app
Fix gitignore conflicts