first commit
first commit
Merge branch 'master' of git@github.com:funyaliga/blog.git into gh-pages

Conflicts:
	_config.yml
first post