Minor changes to the text based on feedback from users
Added author contact details so I can collect usage stats
Added additional challenge to 04-cond to combine conditional, per discussion with @jdblischak
replaced parameter with argument, identified argument with a defualt value of TRUE, and changed name of argument to use_boxplot
Updated new challenge wording to drop boolean and instead refer to the use_boxplot argument
Merge pull request #779 from jhollist/master

Added additional challenge to novice R lesson 04-cond to combine conditional statements.
updated index.md
Merge branch 'matlab-04-cond'
changed double to single quotes in 01-intro
changed single to double quotes in 02-reuse
Merge pull request #781 from ashwinsrnth/master

Updating index for novice MATLAB materials
fixed analyze.m to generate a neater subplot
Added plots to 02-loop
Removed class out from img divs in 01-intro
small fix to make_heatmap
added images used in lessons 2 and 4
added images to lesson 4 and a few small fixes
fixed a bug in call to min function
set 'axis equal' for colormaps, removed TODO: section on colormaps
Fixed bug in time axis conversion