did lotsa stuff -KL
deleted figure -KL
Merge pull request #21 from klocey/master

Fixed conflict in figures directory -KL