Migrated to DocPad
Merge branch 'docpad'

Conflicts:
	.gitignore
	package.json