Igrica je skoraj gotova
Merge branch 'master' of https://github.com/Shapes/gameName

Conflicts:
	js/main.js