graphing stuff
Merge remote-tracking branch 'upstream/master' into upscale_and_clean_up
Merge pull request #24 from alal3177/upscale_and_clean_up

Upscale and clean up