erd, some imports
Merge branch 'master' of https://github.com/ProjectGroep1/Milestone2

Conflicts:
	Latex/Unizo_Pre_verslag.pdf