Merge origin/master

Conflicts:
	src/AppletExamen.java