Merge pull request #5 from rconn01/QA

Qa
First change going through QA 2 files
Merge pull request #6 from rconn01/myJira

My jira