updated the markdown to look better, added a website to cond
merging
Merge branch 'master' of https://github.com/swcarpentry/2014-03-17-nyu-R