Bentrok
Merge branch 'master' of https://github.com/endlessky/Math.git

Conflicts:
	src/arithmetic/Main.java