Hoping the uber button works
Everything works now
commit rebase check
Merge branch 'emergencyMaster'

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

Local master