f8f309f Updating Docpad.coffee
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	Blog/index.html
	assets/styles/style.css
	index.html
	posts/where-now.html
Deleting duplicates
Deleting duplicates