Fixed timing even more, fixed button presses
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/drawable-xxhdpi/ic_launcher.png
	app/src/main/res/drawable-xxhdpi/timer1.png
	app/src/main/res/drawable-xxhdpi/timer10.png
	app/src/main/res/drawable-xxhdpi/timer11.png
	app/src/main/res/drawable-xxhdpi/timer2.png
	app/src/main/res/drawable-xxhdpi/timer3.png
	app/src/main/res/drawable-xxhdpi/timer4.png
	app/src/main/res/drawable-xxhdpi/timer5.png
	app/src/main/res/drawable-xxhdpi/timer6.png
	app/src/main/res/drawable-xxhdpi/timer7.png
	app/src/main/res/drawable-xxhdpi/timer8.png
	app/src/main/res/drawable-xxhdpi/timer9.png
Fixed timing even more, fixed button presses