Can upload and display files
Can upload and display files
Merge pull request #1 from subsetpark/master

Miscellaneuous dumb stuff