Final commit from the hackathon. whoohoo, good job everyone!
Merge branch 'master' of https://github.com/djkeyes/shoptimizer

Conflicts:
	public/stylesheets/foundation.css