Completion of shopping assignment
Completion of Shopping Assignment
Fixing merge issues