4a3f35cd

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into delete-media/3/delete-files

# Conflicts:
#	cmd/app/main.go