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

Conflicts:
	views/header.jade
	views/party/list.jade