Merge pull request #7 from scaperoth/master

TO DO: Fix collision issues when changing lanes
Ready to test changing lanes collision detection
fixed merge