adding foundation
fixing merge conflicts
Merge pull request #37 from jereln/layouts

Layouts