done for the day
one problem left
fixed merge conflict
Merge pull request #90 from simensta/stylin-other-forms

one problem left