Initial commit
Merge branch 'master' into finn

Conflicts:
	LICENSE
	README.md