in class
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9636_01