Major overhaul
Major overhaul
git fix
Merge branch 'master' of github.com:klawd-prime/stack

Conflicts:
	composer.json
	composer.lock
	init.php
	stack/lib/cabinet.php
	stack/lib/file.php
	test/bootstrap.php
	test/lib/cabinettest.php