merging changes
slight modification to rachels changes to complete merge
Merge pull request #24 from deeger/markAll

Mark all