commit from eclipppse
merged
Revert "merged"

This reverts commit 03dc66abbb4d673e5efc9c91911034e2206bbd5e.
committed locally and pushing
Merge branch 'master' of https://github.com/moroccan-dude/multi-test.git

Conflicts:
	com.vogella.egit.multi.java1/src/com/vogella/egit/multi/java1/Dummy2.java