Merge branch 'nooode'
master branch now
Merge branch 'nooode'

Conflicts:
	Node/views/chatroom/chatroom.ejs
Merge branch 'master' into nooode

Conflicts:
	Node/views/chatroom/chatroom.ejs