sdfgsdfg
Finish feature-1
sdasd
Finish release-1
Finish release-1
asdasd
Finish hotfix-1
Finish hotfix-1
asdasd
Finish feature-1
asdasd
Finish 1hotfix-1
Finish 1hotfix-1

Conflicts:
	readme.txt
feature 1
merging 'feature/f_git_1' into develop
updating poms for 0.0.1 release
updating poms for 0.0.1 release
Finish 0.0.1
Finish 0.0.1
f1