Project creation and some default gems
Resolving merge conflict in .gitignore