Major upgrades
Merge branch 'master' of https://github.com/gavargas22/All-City-Screen-Printing

Conflicts:
	index.php
	page-job.php
	style/style.css