added
Merge branch 'master' of https://github.com/liamka/Prism-PHP-Framework

Conflicts:
	.travis.yml