added composer.json
Merge branch 'master' of github.com:dkraczkowski/alchemy

Conflicts:
	app/controller/SampleController.php
added composer.json+moved framework to src