s
e
wwxc
dx
Merge branch 'master' of https://github.com/RednilLabs/javacalc.git

Conflicts:
	JavaCalc/src/JavaCalc.java