Added one line on cat.txt
Merge branch 'master' of https://github.com/michaelsyap/test-git

Conflicts:
	cat.txt