Basic Flask template
basic socketIO app
Merge branch 'master' of github.com:shelf/untitled into new

merging master into local branch
refactored canvas.html into appropriate templates