redirect page
Merge branch 'gh-pages' of https://github.com/torbjornseland/master into gh-pages

Conflicts:
	index.html