Added Click & Collect
Merge branch 'master' of https://github.com/neptikcreative/flour-pot

Conflicts:
	.gitignore