added divide function
Merge branch 'master' into divide

Conflicts:
	main.php
Merge branch 'divide'