Het werkt (easy)
Merge remote-tracking branch 'origin/master'

Conflicts:
	TetrisTemplate/TetrisPrac.v12.suo