Barbara breaks Git
Merge branch 'master' of https://github.com/FlamingoIndustries/Calculator3.0

Conflicts:
	Calc3/src/formulator/FormulaElement.java
	Calc3/src/formulator/Main.java