default value for and or updated
Merge branch 'master' of https://github.com/dbroaden92/PebbleGame