Merge pull request #93 from j3rn/develop

Added consistency to user edit page
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop

Bloody because!
Merge pull request #94 from j3rn/develop

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

lkdfzb jlsnjb fnd nbjlvkfabdjslfb