nao b sranje tesko
Merge branch 'master' of https://github.com/veljamatic/happymeal

Conflicts:
	www/js/main.js