Safo yay
Merge pull request #9 from jameslennon321/master

Implemented remaining operations
Merge pull request #10 from TheSafo/master

Safo yay
Merge pull request #11 from jameslennon321/master

Started example game
Began automatic server discovery
Merge pull request #12 from jameslennon321/master

Added Server IP Advertisement
included James's classes for finding server
Merge branch 'master' of https://github.com/HWComputerScience/PlayPhone

* 'master' of https://github.com/HWComputerScience/PlayPhone:
  Safo yay
Merge pull request #13 from ethanmad/master

Automatic server discovery for Android
fixed port and ip finding
changed package name
reference new package name
Add phoneID and fbuid to data
updated to properly transfer data to server
added new strings for info activity
Created GameConnection.java and made it put userdata into id
update build.gradle
Merge pull request #14 from ethanmad/master

Android client now connects to server and transmits JSON data
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ServerAPI/PlayPhone/Server.h