lab_wall
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1
several textures etc
ceiling_texture
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1

Conflicts:
	models/lab_wall01.max
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1
textures and models