t

t
Merge branch 'master' of https://github.com/utarsuno/PhotonPhase

Conflicts:
	PhotonPhase/bin/com/uladzislau/photonphase/ai/PlayerAI.class
	PhotonPhase/bin/com/uladzislau/photonphase/game_state/Configurate.class
	PhotonPhase/bin/com/uladzislau/photonphase/gui/Slider.class

PhotonPhase/bin/com/uladzislau/photonphase/particle/ParticleManager.clas
s