theme commit
Merge branch 'master' of github.com:720kb/ghost-theme

Conflicts:
	README.md
	default.hbs
	package.json