Better wording
Merge branch 'master' of https://github.com/Iteam1337/iteam-se.docpad

Conflicts:
	src/documents/index.html.jade
Merge branch 'master' into stage