commit -a
Merge branch 'master' of https://github.com/Implies/Implies

Conflicts:
	cgi/editsub.cgi