modified main.cpp
Merge branch 'LabCon' of https://github.com/Bardo91/TrabajosUS into LabCon