initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/commentApp.js.gz
	assets/main.css.gz
	assets/main.js.gz
	blogging-as-a-diary/index.html