Merge pull request #98 from j3rn/develop

Centered 'Dashboard'
why didnt that work before
Merge pull request #99 from MarwanNakhaleh/develop

why didnt that work before
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

jsahjdgaj