First Commit
Merge conflict in gitignore resolved