put dbc.yaml in .gitignore
also added dbc.yaml to .gitignore
Merge branch 'styledFrontPage'
Resolving merge conflict with master