Merge remote-tracking branch 'upstream/master' into HEAD

Dang
Merge pull request #1 from ugastro-decals/master

ya
Merge branch 'master' of https://github.com/cagostino/IDL-Decal---Students into HEAD
ya
tutorial3.pro
Finished tutorial3
Finished tutorial3
Finished tutorial3
swg swag
swag swag
Merge branch 'master' of https://github.com/ugastro-decals/IDL-Decal---Students into HEAD
swag
Finished this tutorial 4
finished tutorial4

sorry if I’m submitting this incorrectly
Tutorial 5
Merge remote-tracking branch 'upstream/master'
Merge pull request #35 from domagalski/master

Tutorial 5
finished-ish tutorial 4

fixed error
finishedtutorial4

for real this time??
actuallyfinishedtutorial4

really really
Finished tut4 and turning it in
Merge pull request #36 from ozziehayz/master

Finished tut4 and turning it in