Just trying to get hold of the latest version of the code
Merge branch 'master' of https://github.com/PascalSteger/darcoda
minor changes
merge conflict attempt
changed some pdb back inte ipdb
Merge branch 'hs-dev' of https://github.com/PascalSteger/darcoda into hs-dev
trying to merge things