Changed add function logic from && to ||
Merge branch 'master' of https://github.com/marc-parillo/GitTest