By: Michael Lynch <git@mtlynch.io>
Merge branch 'slice-1' into slice-2 # Conflicts: # Dockerfile # handlers/upload_test.go