setup
Merge branch 'master' of github.com:barons/zf1

Conflic:
	README.md