add "Git test by user"

Signed-off-by: USER <USER@email.com>
add Minim/

Signed-off-by: USER <USER@email.com>
merge newBranch to master

Conflicts:
	test.txt
merge newBranch to master again.

Conflicts:
	test.txt