Branch identifier
Merge branch 'master' of https://github.com/Frobitz/lshift-www-masonry

Conflicts:
	src/jade/includes/header.jade