Fixed some merge error stuff
Fixed all of the things with Johnny
Merge remote-tracking branch 'origin/master' into BillyDevBranch