Merge pull request #4 from cmhughes/master

added lightning, provided possible timeline, removed elearning2014 from ...
WeBWorK timeline and minor edits