rework
Merge branch 'master' of https://github.com/KasperFranz/SU-project-El
Revert "rework"

This reverts commit 3b012677c34dacbe681fa59da54939e9bfac4ac9.