Test commit; adds  two new panels and the imat map; rm if this break things
Merge branch 'master' of https://github.com/Nieo/dat215
Merge branch 'master' of https://github.com/Nieo/dat215
Merge branch 'master' of https://github.com/Nieo/dat215
Added a shoppingCartPanel and modified the lists panel