Merge pull request #12 from CapstoneCsMu/master

Merging Cecilia's branch to Master
Merge remote-tracking branch 'origin/cecilia'