Story time
Merge branch 'master' of github.com:jdonkervliet/Alitheia-Core

Conflicts:
	4138732-4161890/assignment1/report.md