ClientView created
Merge remote-tracking branch 'origin/master'

Conflicts:
	Poker/src/poker/GUI/ClientView.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Poker/src/poker/GUI/ClientView.java
Merge remote-tracking branch 'origin/master'