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

Conflicts:
	public/global/css/style.css
	public/global/css/style.styl
	views/layout.jade