almost ready
Merge branch 'master' of github.com:forzi/test

Conflicts:
	Controller.php
	Model.php