(300) Basic Homepage Technology
(300) Basic Homepage Technology
Merge branch '2-2-stable' of https://github.com/annarbortees/annarbortees-spree into 2-2-stable

Conflicts:
	Gemfile.lock