Initial commit
Solved merge conflict in .gitignore file