merge
Merge remote-tracking branch 'upstream/master'
Dodana komunikacija s djangotom.
Merge remote-tracking branch 'origin/temp'

Conflicts:
	AngularJS/index.html
	AngularJS/partials/login.html
Dodane funkcionalnosti. In urejene zadeve v index.html.
Merge pull request #18 from simonrakovic/master

Dodane in popravljene funkcijonalnosti