Docpad files updated
trying to merge properlyMerge branch 'master' of https://github.com/yfalckytter/GRADE2014 into lfy-GRADE

Conflicts:
	package.json