commit

to sync
Merge branch 'master' of https://github.com/ibanes88/CCT

Conflicts:
	CCT.pde
	build-tmp/CCT.class
	build-tmp/source/CCT.java