Merge pull request #6 from scaperoth/master

Lane change works
Ready to rest collision prevention
fixed merged