first commit
fix .gitignore file conflict