Merge pull request #5 from tnason/master

getting new stuff
patches and track parser
layout with a switch
green line, switches not hooked up yet
Merge pull request #62 from jamesclampffer/master

got the green line set up, switches not connected yet