Commit1
Commit2
Commit3
Commit 1 release 1.0
Commit4 develop
Commit5 develop
Commit 2 release 1.0
Commit 3 release 1.0
Merge branch 'develop' into release-1.0

Conflicts:
	src/egit/ClaseA.java