Merge branch 'hotfix/fixx' into develop
release
release2.0
hotfix 1.4
Merge branch 'release/2.0'
Merge branch 'hotfix/1.4'

Conflicts:
	hello.txt
Merge branch 'master' of github.com:kawasakitoshiya/git-flow-test

Conflicts:
	hello.txt