eriks commit.
Merge remote-tracking branch 'origin/master' into introduction

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master' into introduction

Conflicts:
	index.html
Merge remote-tracking branch 'origin/pr/10'

Conflicts:
	index.html