joe
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1

Conflicts:
	Barrel.max
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1