boom
Merge branch 'master' of https://github.com/DMLong/AlarmTube

Conflicts:
	AlarmTube/bin/AlarmTube.apk
	AlarmTube/bin/classes.dex
	AlarmTube/bin/resources.ap_