Kristi's changes
Merge pull request #41 from CapstoneCsMu/master

Kristi's changes