Fixing Tony's Hacks
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/undecided/DirectoryLister.java