Done
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2
DONe
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe2