Corrected some examples to use samurais and ninjas XD don't know how conan ended up in the Katas xD
Merge branch 'master' into vs2010