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

Conflicts:
	AlarmTube/bin/AndroidManifest.xml