Trying to fix exception related to logging
libs
Merge commit '3628bfe1878aabf9db8d7a2ae58cbcf94ad7b236'

Conflicts:
	.classpath
	pom.xml
Fixing pom and main, I guess
Merge branch 'master' of https://github.com/bradsk88/LazyTorrent

Conflicts:
	.classpath
	.gitignore
	build/build.xml
	build/dist/SuperLazy.jar
	src/ca/bradj/lazytorrent/app/Main.java
Removing merge-garbage from Main