WtF
Merge branch 'master' of
https://github.com/alacrampe/PresentationTimerAL.git

Conflicts:
	gen/com/example/presentationtimer/R.java