02200914 morning update
Merge branch 'master' of https://github.com/12eeeeee/insightpresentation

Conflicts:
	routes/article.js
	views/canvas.html
	views/pmenu.html
Merge branch 'master' of https://github.com/12eeeeee/insightpresentation

Conflicts:
	routes/article.js
	views/canvas.html
	views/pmenu.html