Merge branch 'master' of https://github.com/hariadi/assemble-blog-theme into hariadi-master

Conflicts:
	Gruntfile.js
	package.json