getting data from the node server
Merge branch 'master' of https://github.com/sergioreyesthefirst/The-Room

Conflicts:
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml