committing ignore
some progress, havent tested.
Merge branch 'master' of https://github.com/DMLong/AlarmTube.git

Conflicts:
	AlarmTube/AndroidManifest.xml