Getting ready to do latency work
Merge branch 'master' of https://github.com/macisasandwich/PairTunes.git

Conflicts:
	src/code/InitiaterClient.java