merge
fixing conflict
fix merge conflicts
create a custom buttom and now click reflect the right color
try to pull xie's change
add xie's changes
now is gray and white board with x show selection
added Create Game menu for different size games
testing
test2
fixed a small error in xml
pull again with error fixed
fix merge conflict
Merged Create Game screens into a single screen. Added a dynamic submit
button for Create Game. Added functionality for creating medium and
large games.
added an alert popup for the submit button
added basic functionality in parsing the grid of buttons on the Android
and creating an array of ints to represent the game created.
merging with Xiaoxia's
merging with Xiaoxia's
try to get the newest version
try to fix conflict