tareas
Merge branch 'master' of https://github.com/BernalF/acme_class

Conflicts:
	solutions/acme_class.v11.suo