OMG sales works
completed changed to shipped
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3