testing github
track rendering
Merge pull request #1 from tnason/master

updating my stuff
Merge pull request #7 from jamesclampffer/master

TM updates