Server seems to be working now.
Server setup for merge with branch client