Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

Bloody because!
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

lkdfzb jlsnjb fnd nbjlvkfabdjslfb
Fixed dashboard
Merge pull request #95 from j3rn/develop

Fixed Dashboard