reset implemented
push
merge errors fixed
fixed sprint backlog
prob no go
Merge remote-tracking branch 'origin/boco'
fixing bugs
fixing bugs
more fixes
Merge branch 'master' into darko