Not much time left...
Merge branch 'master' of https://github.com/Frotty/24Challenge
Crap