what the initial commit
resolved comflicts
Removed commetns because git is way better than comments