Did the Calculator
Merge branch 'workingMaster' into testMerge

Conflicts:
	src/com/itcs4155/haveyourbac/MyTab.java
Merge pull request #15 from KShaw29/testMerge

Everything we did on Dec 7th into master