k
Merge pull request #18 from alfeko/master

ui update
Fortsat på gemmeting
Edit company method
Merge pull request #21 from alfeko/alexbranch

Alexbranch
Fixed branch
Merge pull request #25 from alfeko/master

Updated with master