Merge pull request #1 from LianScarlet/master

merge lee
delete
con

Conflicts:
	HTML/form_empty.html
Merge pull request #2 from y7771197/master

delete