Still dealing with merge problems. My current version doesn't compile - errors in route area of program.
Merge branch 'master' of https://github.com/rebeccaj/SFMTASimulation