second commit

second
Merge branch 'master' of https://github.com/crocodev/Diet

Conflicts:
	test/composer.json