Merge branch 'master' of C:\Users\Jesse\Dropbox\Hogeschool Rotterdam\Adventuretrack\AdventureTrack with conflicts.
Strings Fix