fixed merge, whoo
Merge branch 'master' of https://github.com/partyhopper/PartyHopper