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

# By Hans Rollman
# Via Hans Rollman
* 'master' of https://github.com/Iteam1337/iteam-se.docpad:
  Updated history
  Updated History

Conflicts:
	src/documents/sections/about.html.jade