Merge branch 'master' of https://github.com/spencer1248/BEWDiful_Students
my midterm
Merge remote-tracking branch 'origin'