working on messaging protocal
merge conflicts
message system working
testsfor messages
merge conflicts
userinfo bye bye
Merge pull request #19 from CanvasApp/messages

Messages
start of branch
Merge branch 'dev' into hookup
just to get everthing synced

:w
working
Merge pull request #20 from CanvasApp/hookup

Hookup
merge conflicts