Merge pull request #45 from joelcoxokc/sprint7

Sprint7