merge
Merge branch 'master' of https://github.com/tadamiec/LEGO-Mindstorms.git

Conflicts:
	NXTest/bin/Test.class
	NXTest/src/Test.java