finalize cmpt project
Merge branch 'master' of github.com:vaot/various

Conflicts:
	consumption/check_consume.py