Merge pull request #13 from cmds4410/Connor

Connor
Merge pull request #14 from cmds4410/Connor

Connor
Merge pull request #15 from cmds4410/Connor

current state of affairs
Added shuttle/security/dominoes call functionality to flip sheet
Merge pull request #16 from cmds4410/Connor

Fixed BAC
Merge remote-tracking branch 'origin/master' into Tristan2
Merge remote-tracking branch 'origin/master' into Tristan2
nominal changes
Merge pull request #17 from cmds4410/Connor

Connor
Trying to figure out initialDrinkingVC view swapping
Merge remote-tracking branch 'origin/master' into Tristan2

Conflicts:
	IviesCompanionApp/IviesCompanionApp/Constants.h
	IviesCompanionApp/IviesCompanionApp/MainViewController.m
	IviesCompanionApp/IviesCompanionApp/ModalViewController.xib
Merge remote-tracking branch 'origin/Connor' into Tristan2

Conflicts:
	IviesCompanionApp/IviesCompanionApp/ModalViewController.xib
	IviesCompanionApp/IviesCompanionApp/initialDrinkingViewController.m
Merge remote-tracking branch 'origin/Connor' into Tristan2

Conflicts:
	IviesCompanionApp/IviesCompanionApp/ModalViewController.h
	IviesCompanionApp/IviesCompanionApp/initialDrinkingViewController.xib
Commit all the changes! All the start/keep drinking stuff works! Just gotta resize and polish buttons
Tweaked DrinkCounterVC layout/Buttons
Got rid of clear button (same as start drinking), but made a clear function (called when StartDrinking is clicked)