MAJ
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	source/css/style.css
Merge branch 'master' of https://github.com/Dimensions2014/dimensions