Post modification testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
Dev url
Merge branch 'master' of https://github.com/rokiwi/rokiwi.github.io

Conflicts:
	_posts/articles/2011-03-10-sample-post.md
	_posts/articles/2013-05-22-sample-post-images.md