Zmena v package.json
Zmena v package.json
Merge branch 'master' of https://github.com/gitpajo/gmProject

Conflicts:
	package.json