added cars to gui
fixed merge problems
removed unnecessary files
Merge pull request #4 from scaperoth/master

Getting merged files 5:19pm