Post merge stuff
Merge branch 'master' of https://github.com/TomMulvaney/LivingWithADragon