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

Because I really need it
Merge branch 'develop' of github.com:TeamViperFish/HackathonProject into develop
Made welcome title white
Merge pull request #89 from j3rn/develop

White Title