gemspec
Merge branch 'master' of github.com:walkingfishstudios/Swirls_Template

Conflicts:
	spree_swirls_temp.gemspec