Empiezo historial
Merge branch 'master' of https://github.com/aalabarce/gdd-tp2014-1c
Historial terminado y agrego 2 vistas
Merge branch 'master' of https://github.com/aalabarce/gdd-tp2014-1c