middleman-casper added
middleman-impress added
Merge branch 'master' of https://github.com/middleman/middleman-directory into my-templates

Conflicts:
	data/templates.yml
Merge pull request #20 from danielbayerlein/my-templates

middleman-casper + middleman-impress