New post is added to the _posts folder.
Conflic resolved for the remote part.

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

Conflicts:
	_posts/2014-01-31-rrmda.md