New gallery
Merge branch 'master' into gallery

Conflicts:
	src/styles/style.css.styl
mege.
Merge branch 'gallery'
Merge branch 'master' of github.com:Iteam1337/iteam-se.docpad