godo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/libraries/appcompat_v7_19_0_1.xml
	App/App.iml
	App/src/main/java/com/example/umorning/model/Alarm.java
	libraries/facebook/facebook.iml
	uMorning.iml