options menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	WeightLoss/WeightLoss/src/com/example/weightLoss/Options.java