Merge branch 'master' of https://github.com/nathanyan/torrentder

Conflicts:
	src/main/java/com/nathan/dtorrent/FileUtility.java