design
new
Merge branch 'master' of github.com:barons/zf_shop

Conflicts:
	.gitignore