mian update
Merge branch 'master' of https://github.com/hen31/SpinDP

Conflicts:
	SpinOS/SpinOS.py