Pulling changes
Merge branch 'master' of https://github.com/alexgg321/Proyecto9
Fixing bugs in assignation of cantakes