hoi -> Gideon
Merge branch 'master' of https://github.com/GSamuel/Robotica-2-2013.git

Conflicts:
	Robotica 2 PC/src/MainPC.java

Signed-off-by: GSamuel <gideon_hoog@hotmail.com>