hooked in video size selection
getting multiclient stuff
res
Merge branch 'master' of https://github.com/phonpr/cs414-mps

Conflicts:
	Mp2Client/src/org/cs414/mp2/client/controllers/Listener.java
	Mp2Server/resource.txt
	Mp2Server/src/org/cs414/mp2/server/ControlChannel.java
	Mp2Server/src/org/cs414/mp2/server/MediaThread.java
	Mp2Server/src/org/cs414/mp2/server/Server.java
new bandwidth calc