try to fix merging conflict
try to fix merging conflict
Added huskysoftlogo
Fixed activity_main.xml
Added a demo for heroku server code
add a new screen to create a game
add create_game.xml
Changed .gitignore to ignore *.class files
Added NonoPuzzle.java for Han
Added basic screens and button UIs for the main menu and features
Fixed R.java for merge
Fixed manifest and code that's causing the app to crash
merge
fixing conflict
create a game-- able to click
fix merge conflicts
try push to upstream
remove unused nonogramFun
create a custom buttom and now click reflect the right color
Create Readme.txt