function main not defined
Merge branch 'master' of github.com:joaoA/comp2013