provide ipython notebook server & rstudio server
fix merge conflict in README, sorry
Merge pull request #3 from cboettig/master

provide ipython notebook server & rstudio server