Initial Commit
Resolving conflict in .gitignore