reset 7
Merge branch 'master' of github.com:AlexanderTAdams/hw2_rottenpotatoes