initial commit of all the files
fixed merge conflict in the .gitignore