Rephrased title content in index.html.  Removed detail content.
Fixed mergeconflict.
Merge branch 'master' of github.com:stefanthaler/stefanthaler.github.io

Conflicts:
	index.html