main.c para el tp
Merge branch 'master' of https://github.com/nicolas-vazquez/orga6620-2-2014