na nowo
Merge branch 'master' of https://github.com/arzsz/Aplikacja_Gra_Makao

Conflicts:
	public/index.html