wessel's uncommited changes on applejack
Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite