Fixed some merge error stuff
Fixed all of the things with Johnny
fixed bug with using consumables
minor change to levelUpState

levelUpState now shows how many points have been put into a stat without
scaling
Merge remote-tracking branch 'origin/master' into BillyDevBranch
Fixed some shit
Merge remote-tracking branch 'origin/master' into BranDev-Branch
Changed basehealth