multiply entered
Merge branch 'master' into multiply

Conflicts:
	main.php
Merge branch 'multiply'