loaptopwizigingen 17u35
Merge branch 'master' of https://github.com/ITGroup99PXL/MyFirstProject

Conflicts:
	Lorem Ipsum.docx