Added Server IP Advertisement
Modified server advertisement strategy
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 #15 from jameslennon321/master

A little bit of this, a little bit of that