change styl use method
solve conflict
Merge branch 'master' of github.com:wondger/eureka

Conflicts:
	app.js