Some stuff to set up an alarm, and also get me to stop commiting on master
Merge remote-tracking branch 'origin/master' into dan-dev

Conflicts:
	src/edu/uml/code/activityreminder/ConfigureActivity.java