cc

c
Merge branch 'master' of https://github.com/silentzone/hehe

Conflicts:
	test.txt