crap removal
Merge branch 'master' of https://github.com/crillesvensson/WebApplikationer

Conflicts:

Group4Shop/src/test/java/dit126/group4/group4shop/core/TestDatabase.java