layout
Merge branch 'master' of github.com:nschneid/mwesst-task
trimming