Please commit all your changes before syncing.

Please commit all your changes before syncing.
Merge branch 'gh-pages' of https://github.com/tiwer/blog into gh-pages

Conflicts:
	index.html