e28f9b3 Fixing some bugs
Create README.md
Update README.md
Updated Blog 5/24/14
Resolving conflicts
Updating Docpad.coffee
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
Cleaning up directories
Clean up on Aisle 4