Merging Galina's changes
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3
Fix merge conflicts
Default sleepy sloth pic shows up on product show page
Removed home controller