Ignoring .DS_Store
Fixtures for demo data
Merge branch 'master' into dashboard
Dashboard style settings