Lekker ding.
Merge branch 'development' of https://github.com/Santhura/git-test-1 into development

Conflicts:
	test.jpg