fully automated trials a data returned
Merge branch 'master' of https://github.com/buffalohird/186-Final-Project
merge conflikkks