initial commit for jacob
Merge branch 'jacob' into sebbe

Conflicts:
	README.md