Another branch
Merge branch 'master' of https://github.com/momohuang/AFunRepo

Conflicts:
	file2.txt