rescue
Ajout des pages, blocks et type de blocks
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
pre-merge 21/12
Merge branch 'master' of https://github.com/thomaschvt/vw-project

Conflicts:
	.idea/workspace.xml