creates new rails project
fix merge conflict in readme