#13 Upoznavanje sa githubom
Merge branch 'master' of https://github.com/SoftLab-IS/ermex-pm

Conflicts:
	cross-platform/index.php
Merge branch 'master' of https://github.com/SoftLab-IS/ermex-pm

Conflicts:
	cross-platform/index.arekx.php