Changes made by Matthias Hess (matthias.hess@gmail.com).
Changes made by Matthias Hess (matthias.hess@gmail.com).
Merge branch 'master' of https://github.com/Matthias-Hess/sprep1.git

Conflicts:
	sprep1/index.html