Some tests
Merge origin/master

Conflicts:
	src/Calculator/DemoJOPtionPane.java
	src/Sort/madmax.java