beginnings of new API
Merge branch 'master' into api
tests for api upload, fixes
cat img for site
correct location of cat img