commit from eclipse after commit from Github
commit test1
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