added rockchalk.jpg
Merge branch 'master' of https://github.com/bbthorson/shop

Conflicts:
	config/global.json