phko: Thu 18:24
solving conflict
Merge branch 'master' of github.com:j45ch/icst_cmj_mapping