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
done
Finished tutorial4
finished tutorial4
Rename tutorial4.pro to Student-Directories/SSheikh/tutorial4.pro

Accidentally put this in the main page instead of my directory. Hopefully this will fix it.
Hopefully this will fix it...
Added tutorial4
Finished tutorial4
Merge branch 'master' of https://github.com/archipleym/IDL-Decal---Students
Finished tutorial4