added branch gh-pages
added hipache configuration
Merge branch 'master' into gh-pages

Conflicts:
	slides/index.html