i
Merge branch 'master' of https://github.com/AranyaLi/Ugly-Web-

Conflicts:
	validate.js
add more form elements