initial commit
add .project and .classpath
Merge remote-tracking branch 'origin/master'