Add balks and checkCollision.
Merge branch 'master' of https://github.com/zm112211mz/shiftingdrip

Conflicts:
	ShiftingDrip/Classes/Terrain.cpp
	ShiftingDrip/Classes/Terrain.h