,
Merge branch 'master' of https://github.com/HejterzyJavy/GraoTron

Conflicts:
	Walka/skrypty/main.js