deleted useless files and added .gitignore file
fixed merge conflicts