conflicts resolved
Merge branch 'master' of https://github.com/Veerand/supermegalaheprojekt.git