Edit mode
Merge remote-tracking branch 'GitHub/master'

Conflicts:
	CloudAlarmClock/src/com/cs252/cloudalarmclock/Alarm.java
	CloudAlarmClock/src/com/cs252/cloudalarmclock/DBconnector.java