some changes
??
Merge branch 'Åsa' of https://github.com/asahellgren/Frilansa.git