Dashboard created
merge conflict w gitignore