refresh merge
checkout
manual override- fuck yourself
porpavki i guess
sprints, sprints everywhere
pokaze trenutni sprint
popravek prejsnjega commita
Merge branch 'master' into darko

Conflicts:
	application/controllers/addTask.php
	application/controllers/mytasks.php
	application/controllers/verifyAddTask.php
	application/views/mytasks_view.php

	modified:   application/controllers/addTask.php
	modified:   application/controllers/addproject.php
	modified:   application/controllers/addsprint.php
	modified:   application/controllers/addstory.php
	modified:   application/controllers/adduser.php
	modified:   application/controllers/administration.php
	modified:   application/controllers/editproject.php
	modified:   application/controllers/home.php
	modified:   application/controllers/mytasks.php
	modified:   application/controllers/productbacklog.php
	modified:   application/controllers/sprintBacklog.php
	modified:   application/controllers/unfinishedstories.php
	modified:   application/controllers/verifyAddTask.php
	modified:   application/controllers/verifyaddproject.php
	modified:   application/controllers/verifyaddsprint.php
	modified:   application/controllers/verifyaddstory.php
	modified:   application/controllers/verifyadduser.php
	modified:   application/controllers/viewTasks.php
	modified:   application/models/sprints.php
	modified:   application/views/addsprint_view.php
	modified:   application/views/adduser_view.php
	modified:   application/views/header.php
	modified:   application/views/mytasks_view.php
	deleted:    application/views/projectsuccess.php
	deleted:    application/views/sprintsuccess.php
	modified:   application/views/unfinishedstories_view.php
	deleted:    css/.styles.css.kate-swp
	modified:   css/styles.css
	modified:   application/views/adduser_view.php
	modified:   application/views/mytasks_view.php
	modified:   css/styles.css