Arreglitos
Soluciono conflictos
Merge branch 'master' of https://github.com/aalabarce/gdd-tp2014-1c