resolving 1
Merge branch 'master' of https://github.com/sergmor/CCHW2.git
adding deletion stuff