Merge branch 'janiMergeMaster'
Merge branch 'master' of https://github.com/Dyrnwyn-SEM-GU/Stalker-repository.git
sorting out the main branch