Added all the initial files
Merged the conflicts in .gitignore