Add conference url to PlayerInfo. Create conference before joining game
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/edu/usc/csci201/tanks/PlayerInfo.java
Fix unable to join issue
Weird stuff with getPlayerInfos