solve code rotate problem
solve pull conflict, but code is not generate
Merge branch 'master' of github.com:wondger/eureka

Conflicts:
	public/party/css/style.css
	public/party/css/style.styl
	views/party/list.jade