Changed Tags to comply with Team Maru's set of accepted tags
Merge branch 'master' of https://github.com/water-cat1/Synergy.git