Added test dummy stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ctec/chopsticks/controller/ChopVal.java