some new stuffs
Merge branch 'master' of https://github.com/geekmj/geekmj.github.io.git

Conflicts:
	_posts/javascript/example-string-type.md