cancel edit fix
Merge branch 'MainBranch' of https://github.com/Fnooord/TeamProjectHse272-2.git