comment line toegevoegd
Merge remote-tracking branch 'origin/master'

Conflicts:
	Robotica_PC_githubtest/src/GithubTestClass.java