Almost final version! (very bad message for a commit)
Merge branch 'gh-pages' of github.com:sebastian-c/r-apr2013 into gh-pages

Conflicts:
	index.html
Trying to fix something!