02: Init
Merge branch 'master' of https://github.com/aengelke/hlr-1415
02: First step merging the two directories