Merge branch 'master' of https://github.com/irene001/papercut

Conflicts:
	models/Message.js
	routes/papercut.js
	views/index.ejs