added some vids
Merge branch 'master' of https://github.com/DMLong/AlarmTube.git

Conflicts:
	AlarmTube/src/com/example/alarmtube/CountDown.java
	AlarmTube/src/com/example/alarmtube/FriendDataManager.java