adambot changes
Merge branch 'aok' of https://github.com/ltchin/Battle-and-or-code into aok