init
Merge branch 'master' of https://github.com/dihihi/test_git.git

Conflicts:
	src/CC.java