Fixed column collisions and tunnel collisions
started working on deviating from the home slice
Merge branch 'master' of https://github.com/arellanj/Current

Conflicts:
	CurrentApp.cpp