Commited the code to git
commited gitignore
removed conflict