introduction for Andreas
Merge remote-tracking branch 'origin/master' into introduction

Conflicts:
	index.html
Merge pull request #1 from wederbrand/introduction

introduction for Andreas
Merge remote-tracking branch 'origin' into introduction-andlju

Conflicts:
	index.html