comment
comment2
Update Bla.java
commit3
Update Bla.java
commit5
Merge branch 'develop' of https://github.com/xl8/git-try.git into
develop

Conflicts:
	git-try/src/main/java/com/exelate/Bla.java