just because
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1

Conflicts:
	models/lobby_wall01.max
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1
get on my lvl