Try to solve the collapsing branches by looking at it :-/
Merge branch 'master' of github.com:mens-amplio/modeling