.gitignore file is modified to remove bin/ and log/ directory.
Torpedo.jar rebuilt after successful merge.