Merge branch 'lulz' of https://github.com/StefanRvO/TestRepo into lulz

Conflicts:
	README.md

Merge remote-tracking branch 'origin/lulz' into
lulz

Conflicts:
	README.md

Major bug fix