First Commit
conflict in git ignore resolved