change welcome.js in node.js
Merge branches 'develop' and 'develop' of github.com:HackathonMafia/Mafia into develop

Conflicts:
	routes/welcome.js
Merge branch 'develop' of github.com:HackathonMafia/Mafia into develop