it is test
Merge branch 'master' of github.com:ChapChap/BroCode

Conflicts:
	2048.c
Merge branch 'master' of github.com:ChapChap/BroCode

Conflicts:
	2048.c