Dasboard is ready and nice
Renamed this file
Fixed merge conflicts
Some more merge and small conflicts
Merge pull request #29 from lingow/DashboardNice

Dashboard nice