user dashboard
solve conflict
Merge pull request #13 from JohannaMW/chuck_dev

user dashboard