Log4j

merges log4j with main