some stuff
Merge branch 'master' of https://github.com/Ansrala/Delta_project2
yaaay