gitigore has been added
Conflict resolved