adjust to  pull, nothing special
Merge remote-tracking branch 'origin/master'

Conflicts:
	SparkMoWare/logic/SparkMoVare.java
	bin/logic/SparkMoVare.class