Merge pull request #125 from Team-H/develop

merging updates from sprint 2
Merge pull request #126 from Team-H/master

resync with master