first commit
Merge branch 'master' of github.com:mollerhoj/sad1-1