init
bug fix
misc
Merge branch 'upstream-master'

Conflicts:
	.gitignore
Shuffle files around