modificando el Kardex.scala
Control de asignaturas
Merge branch 'master' into repair

Conflicts:
	appchallenge/app/controllers/AsignaturasController.scala
Merge branch 'repair'
Merge branch 'master' of https://github.com/Wirwing/app_challenge