Start adding markup
Merge branch 'master' of https://github.com/cbehrends/QuixoticCommerce

* 'master' of https://github.com/cbehrends/QuixoticCommerce:
  Start adding markup

Conflicts:
	data/junk.mv.db
	web/src/main/resources/assets/default/css/core.css
	web/src/main/resources/assets/default/home.hbs
	web/src/main/resources/assets/default/sitemaster.hbs