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

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop
Started document structure for EAD.