git st
Merge and more mergre

Merge branch 'master' of github.com:casesandberg/hella