changed small thing in manifest
Merge branch 'development' of https://github.com/Zeroe31890/ElectricFlurry into development
tried to fix conflicts
got simple votes mainly done and started complicated votes with no actual voting ability