Github is angry about deleted files :(

It made me do this
Merge branch 'master' of https://github.com/FlamingoIndustries/supercalc

Conflicts:
	Calculator/src/CalculatorUI.java