testiram commit & push
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from ipri2013/master

Upam da ne bom kej zje... :D
Merge pull request #2 from alesblaznik/master

Search
Merge pull request #14 from alesblaznik/master

Uporaba novih templatov tam kjer še niso bili uporabljeni.
Merge pull request #15 from alesblaznik/master

Authentikacija.
Merge branch 'master' of https://github.com/alesblaznik/opencollea
Merge pull request #19 from alesblaznik/master

Twitter Bootstrap
Testiram vnose v bazo (.db)
Merge pull request #4 from ipri2013/master

Update kode
Povezal AngularJS z Djangom s pomocjo Tastypie
Merge pull request #5 from aOberstar/master

Update Andrazeve kode
Merge pull request #25 from aOberstar/master

AngularJS
Merge pull request #6 from ipri2013/master

AngularJS
Tortni diagram predmetov

Dodan tortni diagram predmetov, ki pa zaenkrat uporablja fake procente -
torej to je potrebno samo se nastimati, da se bo bralo iz baze in bo
taprava vrednost
Merge pull request #26 from zigaemersic/master

Tortni diagram predmetov
Merge pull request #3 from ipri2013/master

Pull k sebi