PictureVC shows action sheet automatically
PictureVC shows action sheet automatically
Merge branch 'Connor' of https://github.com/cmds4410/IviesCompanionApp into Connor
Updated CollectionView logic
Safety. Security. Wellness.
Merge pull request #17 from cmds4410/Connor

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

Conflicts:
	IviesCompanionApp/IviesCompanionApp/Constants.h
	IviesCompanionApp/IviesCompanionApp/MainViewController.m
	IviesCompanionApp/IviesCompanionApp/ModalViewController.xib