first commit through term
Merge branch 'master' of https://github.com/mortenhanssen89/feide