port change to 3000, and other little change
solve conflict

Merge branch 'master' of github.com:wondger/eureka

Conflicts:
	app.js