Debug time...
Merge branch 'master' of github.com:Aluriak/TheCodingStones