upload
yup
Merge branch 'master' of https://github.com/Shoxxy/sokp_device

Conflicts:
	README.md