This is Michael's
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1