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
Added JS function to Reg.html
button
Added placeholders and removed username
Added placeholders and removed username
Merge branch 'master' of https://github.com/TaylorHastings/web102.git
Merge branch 'master' of https://github.com/chscodecamp/web102
Div's created for labels  on reg.html. Margins created on reg.css.
(Taylor)
New margins set on css and classes/divs created in html (Taylor)
Added some jquery to the submit button
properly aligned span to fit inside password div
merge conflict fix
merge conflict Taylor
Delete testing box
Merge pull request #28 from TaylorHastings/master

reg