Added Server IP Advertisement
Merge pull request #13 from ethanmad/master

Automatic server discovery for Android
Modified server advertisement strategy
Merge pull request #14 from ethanmad/master

Android client now connects to server and transmits JSON data
Added preliminary color palette
Merge remote-tracking branch 'origin/master'

Conflicts:
	ServerAPI/PlayPhone/Server.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ServerAPI/PlayPhone/Server.h
Merge pull request #16 from ethanmad/master

Android: connect to correct port and start response to server
Merge pull request #15 from jameslennon321/master

A little bit of this, a little bit of that