correct mul function
Merge branch 'development'

Conflicts:
	src/Math.java