server
fixed conflicts
fixed port problems. added party.js