added a server.command folder with CommandTemplate.java in it
Merge remote-tracking branch 'origin/master'