Merge pull request #4 from scaperoth/master

Getting merged files 5:19pm
Merge pull request #5 from scaperoth/master

stable code
Ready to rest lane change
Merge pull request #2 from awp1121/master

pulling smartcar method updates from awp