more examples
Merge branch 'master' of https://github.com/jonschlinkert/assemble-examples-basic into jonschlinkert-master

Conflicts:
	Gruntfile.js
Merge branch 'jonschlinkert-master'

Conflicts:
	Gruntfile.js