try to commit jar
Merge branch 'master' of https://github.com/DirewolfStudio/DotAHeroServer

Conflicts:

ChatLogger_server/src/com/electrotank/examples/chatlogger/ChatPlugin.jav
a