working on form validation
Merge branch 'master' of https://github.com/jeffmccommas/productmanager

Conflicts:
	public/css/main.css