merge
Merge branch 'master' of https://github.com/water-cat1/Synergy.git