Added scheduled alarm.
Merge branch 'master' of https://github.com/aldenpotamus/drunken-octo-robot

Conflicts:
	app/src/main/java/com/example/aldenroberts/testproject/NotificationIntentService.java