Commit to merge changes.
Commit to merge changes.
Merge branch 'master' of https://github.com/Implies/Implies

Conflicts:
	html/edit.html
Theorems showing on edit.html, newresult.cgi not working