FINALLY, resolved merge conflict, sanitized user input, added enter key listener. I hate git.
Merge pull request #8 from bushwack/master

FINALLY, resolved merge conflict, SANITIZED user input, added enter key ...
Merge pull request #9 from deemz0/master

Added Text Functionality to canvas per Dr. Julien's request
Added some CSS stuff.
Resolved merge conflicts. Added CSS properties. To do: Add more CSS stuff.
more style stuff.
Merge pull request #10 from bushwack/master

Added some CSS stuff.
resolved merge