Merge pull request #2 from CapstoneCsMu/master

Large Update
Merge pull request #5 from CapstoneCsMu/cecilia

Merge pull request #2 from CapstoneCsMu/master