Hopefully sync works now
Merge branch 'master' of https://github.com/macisasandwich/PairTunes.git

Conflicts:
	src/code/InitiatingClient.java
	src/code/InitiatingServer.java
	src/code/RTPClient.java