Novo commit
Merge branch 'master' of https://github.com/a33067/TrabalhosdeCasa

Conflicts:

	aula28-gui-patterns/alerter/src/main/java/pt/isel/mpd14/alerter/Alarm.java

	aula28-gui-patterns/alerter/src/main/java/pt/isel/mpd14/alerter/AlarmAux.java

	aula28-gui-patterns/alerter/src/main/java/pt/isel/mpd14/alerter/IAlarm.java