Merge remote-tracking branch 'origin/master'

Conflicts:
	FacsColab/src/uf/Classes/Abilities/Bomberman/BombermanFireball.java
	FacsColab/src/uf/Classes/Upgrades/Berserker/LumberJack.java
	FacsColab/src/uf/Classes/Upgrades/Marksman/Sharpshooter.java
	FacsColab/src/uf/Main.java
	FacsColab/src/uf/PlayerUtil/ClassSelector.java
	FacsColab/src/uf/PlayerUtil/UpgradeGUI.java
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	FacsColab/src/uf/CPlayer.java