Entrega final#65

Open

carloscrespog wants to merge 19 commits intoging:masterfrom

carloscrespog:master

Commits on Apr 12, 2012

resolved conflicts
carloscrespog
committed

Commits on Apr 15, 2012

Creado modelo y asociaciones
carloscrespog
committed

Commits on Apr 16, 2012

Entrega 6
carloscrespog
committed

Commits on Apr 20, 2012