Redo of page
Merge branch 'master' of https://github.com/cplaue/cplaue.github.io

Conflicts:
	index.html