adding 'my'
express
Merge branch 'master' of github.com:changran52m/nodejs-example

Conflicts:
	index.html
	server.js