Merge pull request #45 from donnell74/develop

Develop into Master: Sprint 5
Merge pull request #47 from donnell74/develop

Develop -> Master, Sprint 5, Continued