Added collision detection

added my collision detection, is buggy though