[~] Tidying
Merge branch 'master' of github.com:expipiplus1/joelang