Merge remote-tracking branch 'origin/master' into david3
Added Class for retrieving the IPV4 from the current device
working
there is an error in the client when receiving message
Merge branch 'david3' into peter

Conflicts:
	sosgame1/src/com/example/sosgame1/MainActivity.java
Merge remote-tracking branch 'origin/bea' into peter

Conflicts:
	sosgame1/src/com/example/sosgame1/MainActivity.java
Trapped null value for out in server and client.
Cleaned up testing for client and server in doSingleTap.
Added test for case where player tries to add a tile on top of another tile.
Added an animation when the player taps on a tile.
Many changes to the client/server stuff. It is working but still a lot
of cleaning up and debugging to do. Main thing left is properly terminating
the threads.