merge conflict
Uploader test, pictures test,
Uploader test, pictures test,
Uploader test, pictures test,
Merge pull request #11 from jdaigneau/jtdtests

Uploader Tests, Pictures Tests