local change in app_2048
Merge branch 'client_server' of github.com:nmaguirre/eiffel-2048 into client_server