error in p24 fixed, still far from finished
Merge branch 'master' of https://github.com/MiroK/INF5650