Merge branch 'harrisonbranch' of https://github.com/Ludusamo/Team-KD.git into KevinBranch
Moved from Folder

Signed-off-by: Springo <kevinmxia@gmail.com>
Merge branch 'KevinBranch' of https://github.com/Ludusamo/Team-KD into harrisonbranch
Enhanced GUI, fixed player.
Merge branch 'Brendan's-Branch' of https://github.com/Ludusamo/Team-KD into harrisonbranch
Signed-off-by: Harrding <harrisond2003@gmail.com>