Merge branch 'master' of https://github.com/helloKittyMeow/ChocAn.git

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/helloKittyMeow/ChocAn.git

Conflicts:
	test.txt