stuff
Merge branch 'master' of https://github.com/JoshGangloff/Grid2Go.git

Conflicts:
	.classpath