Merge pull request #125 from Team-H/develop

merging updates from sprint 2