update
Merge branch 'master' of https://github.com/ggrahambaker/e-com

Conflicts:
	splash.css