fix conflict
Merge branch 'master' of https://github.com/gdietz/OpenMEE into HEAD
model building