fixed edit
NOOOOOOOOOOOO DONT JUDGE US ON OUR COMMITS PLEASESSSSEE!
Merge branch 'master' of github.com:f-prettyland/JP-ChickenPeople