Merge branch 'master' of https://github.com/tristanchanson/virtual-party-manager