commit attempt
Merge branch 'master' of https://github.com/cailenfisher/flanigansapiary

Conflicts:
	application/views/store-header.php