Added shuttle/security/dominoes call functionality to flip sheet
Merge remote-tracking branch 'origin/master' into Tristan2
Merge remote-tracking branch 'origin/master' into Tristan2
nominal changes
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
Tap or swipe to dismiss Schedule modal
Merge remote-tracking branch 'origin/Connor' into Tristan2

Conflicts:
	IviesCompanionApp/IviesCompanionApp/ModalViewController.xib
	IviesCompanionApp/IviesCompanionApp/initialDrinkingViewController.m
Was working in Connor (oops), but only made slight changes to mainVC and created initialDrinkinVC
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)
Fixed Background Image for InitialDrinkVC
Merge pull request #19 from cmds4410/Connor

Added Tristan's Edits