Ajout Classe Bloc Special
Merge branch 'master' of git://github.com/conradkleinespel/super-mario-univ-paris5

Conflicts:
	js/angularapp/controllers.js