Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite

Conflicts:
	language_machines/settings.py
	requirements.txt