local commit test
Merge branch 'master' of https://github.com/sunnyork/SNKpersonal

Conflicts:
	test0.txt