all the rails stuff
fix merge conflict with gitignore
fix merge conflict with gitignore again