fixed wrong function for not/comp
Merge branch 'master' of https://github.com/nitromannitol/CS_143_2