b7
Merge branch 'gh-pages' of https://github.com/emosa/WiU into gh-pages

Conflicts:
	WiU Landing Page Template/index.html