Revert "Jag1"

This reverts commit 463936d3fb89cca5391bc6dfb688584a616c538d.
Merge branch 'master' of https://github.com/Spud387/GitLab_Group2