server.jag added
Merge remote-tracking branch 'upstream/master'
Merge pull request #34 from TanyaM/master

server.jag added.