66560b0d

By: Michael Lynch <git@mtlynch.io>

Merge branch 'slice-2' into slice-3

# Conflicts:
#	cmd/app/main.go