Merge branch 'master' of https://github.com/previewict/phpie

Conflicts:
	README.md