Merge remote-tracking branch 'upstream/master'
Added Text functionality to the canvas per Dr. Julien's request
Merge remote-tracking branch 'upstream/master'
Text will now be emitted to all users, also slight restyling of the color picker
Merge pull request #9 from deemz0/master

Added Text Functionality to canvas per Dr. Julien's request