Remove pricing information
Merge conflict fix

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

Conflicts:
	R-workshops/01-r-intro/index.html