merging
Merge pull request #1 from mtomko/layout

Reworking project layout