merge conflicts
Merge branch 'master' of https://github.com/mkunkel/Chomamas-Cards
Merge branch 'master' of https://github.com/mkunkel/Chomamas-Cards
common.js socketReceiveSubmission
Merge branch 'master' of https://github.com/mkunkel/Chomamas-Cards