add .project to gitignore
Merge branch 'master' into sample