Started the Django cms project
Updated templates and style
Added placeholder text
Added users
added more serious lama
lama logo update
added
no backup files in git
Added some nice styling to website
wessel's uncommited changes on applejack
Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite
colours
Added
Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite
Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite

Conflicts:
	language_machines/settings.py
	requirements.txt
Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite

Conflicts:
	language_machines/settings.py
	requirements.txt
Merge branch 'master' of https://github.com/Woseseltops/languagemachineswebsite
added
update
Merge branch 'master' of github.com:Woseseltops/languagemachineswebsite into dev