committing to error check from html
Merge branch 'master' of https://github.com/TaylorHastings/web102.git

Conflicts:
	reg.html
	
	(David)
Merge branch 'master' of https://github.com/TaylorHastings/web102.git
(David2)
Conflicts:
	reg.html