game controller game erb
game logic
fix merge conflict
add navbarish user_profile
Merge branch 'master' into game