File upload working
Merge pull request #1 from laurenashpole/master

File upload working