Added bot files and main method for jar
Fixed conflict