Merge pull request #141 from mreist/master

Getting master
Adding SpeedSolver.activity folder
Merge pull request #142 from mreist/Jay

Jay