Fix for Windows string warning
Merge branch 'feature/dan_nixon_exercises' into develop