doing a commit so that I can do a pull
Merge branch 'master' of https://github.com/rhildred/nodetest.git

Conflicts:
	public/contact.js.html