Test merge
Merge branch 'master' of https://github.com/toka16/BridgeClub

Conflicts:
	src/game/StaticVariables.java