permisions and listing page
Merge branch 'master' of github.com:tswayne/hackathon

Conflicts:
	.htaccess