Kevin First Commit
Second
Third
Merge branch 'master' of https://github.com/334Programming/teamCalculator

Conflicts:
	gitCalculator/src/gitcalculator/GitCalculator.java