Remove unnecessary files
Merge branch 'master-upstream'

Conflicts:
	.gitignore
Merge branch 'master-upstream'