server should only start once now
Merge remote-tracking branch 'origin/master'