finished tutorial4
finished tutorial4
Merge branch 'master' of https://github.com/Sofysicist/IDL-Decal---Students

Conflicts:
	Student Directories/SSheikh/tutorial4.pro
Merge branch 'master' of https://github.com/ugastro-decals/IDL-Decal---Students
Merge branct 'master' of https://github.com/Sofysicist/IDL-Decal---Students

Trying to get my homework...
Finished tutorial5
Merge branch 'master' of https://github.com/ugastro-decals/IDL-Decal---Students
Finished smiley tutorial
Finished homework4
Merge pull request #55 from luxury1/master

Finished homework4
Finished homework 2
finished homework 2

uh not sure if this works but I tried ok
Finished homework 2
Merge pull request #57 from domagalski/master

Finished homework 2
finished homework2
modified homework2
Merge pull request #58 from quanhuynh/master

finished homework2
Finished homework2
Merge pull request #2 from ugastro-decals/master

update
Fix tut6