Miscelanious formatting, mostly unnecessary
Merge remote-tracking branch 'origin/master'