more changes after template changes.
Merge branch 'master' of https://github.com/sshaaf/sshaaf.github.com

Conflicts:
	index.md