tieing things together
Merge branch 'dev' of github.com:snwfog/peerpen into dev