Stomme dick 3
Merge branch 'develop' of https://github.com/Derkje-J/programming-life into develop

Conflicts:
	docs/deliverables/ead/Emergent Architectural Design.tex