adding gitignore
Merge branch 'dev'
Creating Conflict
Merge Sucessful
Wit2
Commit all
suo changes
hh