Update of port and IP for OpenShift server
Merge branch 'master' of https://github.com/cromanor/miart-final

Conflicts:
server.js
Fixed conflict
Merge branch 'master' of https://github.com/cromanor/miart-final

Conflicts:
	server.js
Fix Conflict Finally!