Subiendo Proyecto de Academia Musical
Merge branch 'master' of https://github.com/cristiankmb/AcademiaDeMusica

Conflicts:
	web/index.xhtml