Merge branch 'master' of github.com:muuankarski/muuankarski.github.io

Conflicts:
	_posts/2014-11-25-comment-open-science-reseach-forum.markdown
Merge branch 'master' of github.com:muuankarski/muuankarski.github.io