code cleanup
Merge branch 'master' of https://github.com/crholm/TDDD26-G4-InternetMall