chore status stuff
Merge branch 'master' of https://github.com/lieke/24HCodING