fix merge conflicts
fixed merge conflicts
stuff
Merge pull request #870 from nickavv/parachute

logo PNGs
fix git errors laptop
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
I merged with updated imports