Merge pull request #10 from bushwack/master

Added some CSS stuff.
minor fixes to text tool
resolved merge
attempt to resolve chat and color picker overlap
Merge pull request #11 from deemz0/master

Prevented typing in chat and on canvas simultaneously
Merge remote-tracking branch 'upstream/master'