Merge pull request #5 from GilbertLS/master

Pat's updates
marked where you can put the canvas data

Find them by doing ctrl+f for "//&&!!&&" in app.js and client.js
Merge pull request #6 from pegnovi/master

Node stuff for canvas data