d285a462

By: Michael Lynch <git@mtlynch.io>

Merge branch 'slice-1' into slice-2

# Conflicts:
#	cmd/app/main.go