Actually fixed repo this time.
Added easy-git shell script
readded .classpath
something
Merge remote-tracking branch 'upstream/master'