Edicion de telefonos

Edita pe weon :v:
Merge remote-tracking branch 'origin/master'

Conflicts:
	Agenda/src/main/Application.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Agenda/src/main/Application.java