.
Merge branch 'master' of https://github.com/c0mpas/MobileAppDevelopment.git
Merge branch 'master' of https://github.com/c0mpas/MobileAppDevelopment.git
-
Merge branch 'master' of
https://github.com/c0mpas/MobileAppDevelopment.git

Conflicts:
	MADA_ueb05/src/com/example/mada_ueb05/AlarmActivity.java