THIS IS IT!
Merge branch 'master' of https://github.com/FlamingoIndustries/Calculator3.0

Conflicts:
	Calc3/src/formulator/CalculatorUI.java
I hope this works!
Merge branch 'master' of https://github.com/FlamingoIndustries/Calculator3.0