jos promjena u grani
erewr
jos promjena u grani
Merge branch 'grana22'

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/icavrak/playground

Conflicts:
	README.txt