Removed two products from the product list, added an extra field into contact form, updated database abase schema to match new database column
Merge branch 'master' of github.com:Fishgate/boxyfile-site

Conflicts:
	htdocs/js/script.js
	htdocs/js/script.min.js