change 'or' to 'and'
Merge branch 'master' of https://github.com/opencredit/badgeos