modify .gitignore
add .classpath and .project
Merge remote-tracking branch 'origin/master'