index edit
Merge branch 'gh-pages' of https://github.com/SWC-OSG-Workshop/2014-10-20 into gh-pages

Conflicts:
	_includes/header.html
 edit header