injoon 0224
Merge branch 'master' of https://github.com/12eeeeee/ipresentation

Conflicts:
	app.js
	model/article.js
	routes/article.js
	routes/login.js
	views/Plist.html
	views/canvas.html
	views/createArticle.html
	views/css/reveal.css
	views/css/theme/default.css
	views/index.html
	views/js/main.js
	views/js/recorder.js
	views/js/recorder.js.bak
	views/js/recorderWorker.js
	views/login.html
	views/pmenu.html
	views/practicePPT.html
	views/presentPPT.html
	views/register.html
	views/reveal.html
injoon 0224