dsfdsfds
Merge branch 'master' of https://github.com/PhilippRies/Calc

Conflicts:
	.classpath
	src/de/calc/view/CalcView.java