Revert c4ba55b..df74415

This rolls back to commit c4ba55bf448454db988bf85aa535cf54a90365ea.
Merge branch 'master' of https://github.com/DJxLaurens/ASG2.git