heroku for company
did some changes
Merge branch 'filling-in-layout'