Texte hinzufügen
* New style
Merge branch 'master' of https://github.com/tobinski/protagonist.git

Conflicts:
	index.html

Signed-off-by: protagonistAndy <andy.iten@protagonist.ch>
merged