working on game board jlabel images
merge conflict fix