Fixing stuff ...
Merge branch 'master' of github.com:WeraMorganJakobHansKoding/hackathon