Test Conflict!
Merge branch 'master' of https://github.com/kaichancoder/testgit

Conflicts:
	file1.txt