update to timer and reminder
Merge remote-tracking branch 'origin/master'

Conflicts:

	BattleForDentalPerfection/src/com/example/battlefordentalperfection/reminder.java