Commiting for Chris
Merge branch 'master' of https://github.com/AnotherJoSmith/Shitty_Calculator

Conflicts:
	ShittyCalculator/src/ControlUnit.java