update
update
Merge branch 'master' of github.com:Bloodmanovski/Trinix

Conflicts:
	CC.md