comments and github edit
Merge branch 'master' of github.com:Maltretieren/maltretieren.github.com

Conflicts:
	index.html
edit to push
test
test
test