Class Selector
Class Selector
Merge remote-tracking branch 'origin/master'

Conflicts:
	FacsColab/src/uf/CPlayer.java
	FacsColab/src/uf/Classes/BombermanClass.java
	FacsColab/src/uf/Classes/Class.java
	FacsColab/src/uf/Classes/MarksmanClass.java
	FacsColab/src/uf/Main.java