added subtract
Merge branch 'master' into subtract

Conflicts:
	main.php
Merge branch 'subtract'