current version, fixing sync
Merge branch 'master' of https://github.com/nuts4nuts4nuts/CSI281