commit from terminal
update
Merge branch 'master' of github.com:justinstrauss/pd8_FranStrau_FrancesS-JustinS