scoreBoard bug fixed; game menu tests done
fix merge conflict with sean