Minor changes
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/graphicInterface/Test.java

Merge