update
Merge remote-tracking branch 'origin/master'

Conflicts:

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

	BattleForDentalPerfection/src/com/example/battlefordentalperfection/timer.java
Merge branch 'master' of https://github.com/JRBHcapteeth/CapstoneTeeth

Conflicts:
	BattleForDentalPerfection/bin/BattleForDentalPerfection.apk
	BattleForDentalPerfection/bin/classes.dex

	BattleForDentalPerfection/bin/classes/com/example/battlefordentalperfection/character.class

	BattleForDentalPerfection/bin/classes/com/example/battlefordentalperfection/friendObj.class