Fixing block class

whoops
Merge remote-tracking branch 'origin/master'

Conflicts:
	hvzgame/Bullet.pde