changed names back to Joe and Peter
Merge branch 'master' of https://github.com/jvbbott/cliq