adds file upload test, changes controller param names
Merge pull request #12 from bcutrell/add_file_type_test

adds file upload test, changes controller param names