fixed merge comments in code.
Merge branch 'master' of https://github.com/Network-of-BioThings/GettinCRAFTy