BERNA, IL MAESTRO <3
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	App/App.iml
	App/src/main/java/com/example/umorning/activities/AlarmAddNewActivity.java
	libraries/facebook/facebook.iml
	uMorning.iml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/src/main/java/com/example/umorning/activities/AlarmAddNewActivity.java
god
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	App/App.iml
	libraries/facebook/facebook.iml
	uMorning.iml