commit adit kedua, tanpa pull/clone
Merge branch 'HEAD' of https://github.com/blackjacksme/master.git

Conflicts:
	User/test.txt