add server.js
Merge branch 'master' into sandbox

Conflicts:
	added.html
changes