commit
daily notification working
commit
notification time set to 00:05
Merge remote-tracking branch 'origin/notification'

Conflicts:
	AndroidManifest.xml