Set actionSheet to only show when gender/weight unset
Merge remote-tracking branch 'origin/TristanNew' into Connor

Conflicts:
	IviesCompanionApp/IviesCompanionApp/MainViewController.m
	IviesCompanionApp/IviesCompanionApp/widmarkCalculator.h
Fixed action sheet
Fixed PickerView baseWeight
Merge remote-tracking branch 'origin/TristanNew' into Connor

Conflicts:
	IviesCompanionApp/IviesCompanionApp/DrinkCounterViewController.xib
Merge pull request #14 from cmds4410/Connor

Connor