sanitation
merged
rake sanitation
sanitation all passed
testing
pulled
fixed merge
took out merge
tested retired and unretired for admin products
added store controller tests
all green