hey
Merge branch 'master' of https://github.com/macisasandwich/PairTunes.git
Everything is kind of working
Merge branch 'master' of https://github.com/macisasandwich/PairTunes.git

Conflicts:
	src/code/InitiatingServer.java