Initial Commit
Conflicts resolved for the gitignore