part 3 = formatted kinda
ew
Merge remote-tracking branch 'origin/master'