Merge pull request #34 from COSI236TA/integrate

Integrate