switch room back
Merge branch 'gh-pages' of https://github.com/BernhardKonrad/2014-06-16-davis into gh-pages

Conflicts:
	index.html