Initial commit
Merge branch 'upstream'

Conflicts:
	README.md