Add server jar
Merge conflicts
Merge pull request #13 from ruprict/master

Add server jar