kreiranje projekta
odstranil .fuse file
Merge branch 'lovrenca'
spremenjen style in orderani userji po abecedi
spremember pri prikazo projektov
fixin bočo's merge errors :P
Revert "fixin bočo's merge errors :P"

This reverts commit 9fd2e227c374cc00bfe6e9b14415359ab03b4688.
popravek mojih napak
Beleženje porabe časa.
Merge branch 'darko'

Conflicts:
	application/controllers/viewTasks.php
	application/models/stories.php
	application/models/tasks.php
	application/views/productbacklog.php
	application/views/viewTasks.php

	modified:   application/controllers/addstory.php
	modified:   application/controllers/mytasks.php
	modified:   application/controllers/verifyaddstory.php
	modified:   application/models/project.php
	modified:   application/models/task.php
	modified:   application/views/mytasks_view.php
	modified:   css/styles.css
zdej addtask zgleda, samo dela še ne :P
refreshed as master
popravki ocvirkov
popravki
prikaz zgodb pod unfinished
Merge remote-tracking branch 'origin/boco'
Pri nalogah prikaže še podrobnosti zgodbe v kateri so.
Merge branch 'darko'

Conflicts:
	application/views/addproject_view.php
	application/views/mytasks_view.php
	css/styles.css

	modified:   application/models/task.php
	modified:   application/views/addproject_view.php
	modified:   application/views/mytasks_view.php
mibnor updates-still not working
Merge branch 'lovrenca'