added fixture server
resolved merge conflict
Merge pull request #2 from garyjob/master

added fixture server