sync
fix
Revert "fix"

This reverts commit 705853256733bf9619874f60f4d9f63d9bed4065.
Revert "sync"

This reverts commit abe5155055d1529c4046a3c2f0a177e9bca826b8.
Merge branch 'master' of https://github.com/cookiehunter/SoloProjects.git