nazwa pliku
`
Merge branch 'master' of https://github.com/PsichiX/JustIDS

Conflicts:
	src/com/PsichiX/JustIDS/GameStateManager.java