Pseudo finalizar y ack
Merge branch 'master' of github.com:LeandroLovisolo/SSOO-TP2