Add author.
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	assets/css/main.css
Add FB like.