First commit with bare minimum code
Merge branch 'master-upstream'

Conflicts:
	.gitignore
	README.md