add change of branch test
add change of branche master
Merge branch 'test'

Conflicts:
	jormin.md
add changed log of both branch master and branch test