first screen model contstraints
fixing conflicts
Merge branch 'master' of https://github.com/mathswan/cie-prototype