Fixed Background Image for InitialDrinkVC
Kind of updated PictureVC, still having issues though
Merge remote-tracking branch 'origin/Tristan2' into Connor
Merge remote-tracking branch 'origin/Tristan2' into Connor
Fuck it
Bed Time
Trying to purge this shit

Merge remote-tracking branch 'origin/Connor' into Tristan2

Conflicts:
	IviesCompanionApp/IviesCompanionApp.xcodeproj/project.pbxproj
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-button-high.png
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-button-low.png
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-details-high.png
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-details-low.png
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-drinks-high.png
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-drinks-low.png
	IviesCompanionApp/IviesCompanionApp/BowdoinCompanion/tally-shortlow.png
	IviesCompanionApp/IviesCompanionApp/DrinkCounterViewController.m
	IviesCompanionApp/IviesCompanionApp/DrinkCounterViewController.xib
	IviesCompanionApp/IviesCompanionApp/PictureViewController.m
	IviesCompanionApp/IviesCompanionApp/WellnessViewController.xib
	IviesCompanionApp/IviesCompanionApp/bacActionSheet.m
	IviesCompanionApp/IviesCompanionApp/tally-button-high.png
	IviesCompanionApp/IviesCompanionApp/tally-button-low.png
	IviesCompanionApp/IviesCompanionApp/tally-button.png
	IviesCompanionApp/IviesCompanionApp/tally-button@2x.png
	IviesCompanionApp/IviesCompanionApp/tally-details-high.png
	IviesCompanionApp/IviesCompanionApp/tally-details-low.png
	IviesCompanionApp/IviesCompanionApp/tally-details.png
	IviesCompanionApp/IviesCompanionApp/tally-details@2x.png
	IviesCompanionApp/IviesCompanionApp/tally-drinks-high.png
	IviesCompanionApp/IviesCompanionApp/tally-drinks-low.png
	IviesCompanionApp/IviesCompanionApp/tally-drinks.png
	IviesCompanionApp/IviesCompanionApp/tally-drinks@2x.png