UPDATE SETTINGS
Merge branch 'RoccoL'

Conflicts:
	CharityWorkout/gen/com/c1/charityworkout/R.java