TestMarket + BugFixes!
Merge branch 'master' of https://github.com/Mats77/FallstudieLISA