I've commited a and m
Merge branch 'master' of https://github.com/EMV-FYP/Testing
decide to put haha