Added the beginnings of layout
merged conflict
Merge branch 'master' of https://github.com/amcglathery/turnt-cyril