made more pass
made everything pass
resolved conflicts
Merge pull request #2 from karolinkas/karos-branch-numbers

Karos branch numbers