try R again
Merge branch 'master' of https://github.com/nicolewhite/nicolewhite.github.io

Conflicts:
	_posts/2014-05-06-test.md