Removed gh-pages files
Merge branch 'devel'

Conflicts:
	index.html
	stylesheets/stylesheet.css
Removed remaining gh-pages files