1
Merge branch 'master' of https://github.com/adrianko/peallyframework

Conflicts:
	assets/css/style.css
	controllers/a.php
	controllers/b.php
	core/config.php
	core/core.php
	index.php
	library/db.php
	models/sample.php
	views/sample.php
Merge branch 'master' of https://github.com/adrianko/peallyframework
update
cleanup
Merge branch 'master' of https://github.com/adrianko/peallyframework
Updated to allow use in PHP 5.3