Merge pull request #37 from CCSF-Coders/master

Merge needed