testing drawing app
321
Merge branch 'master' of https://github.com/marieshifeng/vincere

Conflicts:
	views/connect.ejs
Merge branch 'master' of https://github.com/marieshifeng/vincere