Merge pull request #4 from GSamuel/Gideon-Branch

Gideon branch
Merge pull request #5 from GSamuel/Gideon-Branch

Gideon branch
Spatie toevoegen

Hoi
test
Merge branch 'master' of https://github.com/GSamuel/Robotica-2-2013.git into Gideon-Branch

Conflicts:
	Robotica 2 PC/src/robotica/ConnectionManager.java