Enable haptics when the timer runs out
Merge branch 'master' of github.com:mstuart/samsung-android-hackathon