finished combining layouts
Merge branch 'master' of github.com:mromrell/quotadeck-frontend