Old, old changes...
Merge branch 'master' of github.com:sixtyfive/php-directory-listing

Conflicts:
	src/DirectoryListing.class.php
	src/html.php