upload file
upload files
upload files
upload files
upload files
upload files
Merge branch 'master' of https://github.com/denny-p/plaintext-index.git

Conflicts:
	files/textfile1.txt