Merge pull request #7 from Apelon-VA/master

pushing sprint work up to gold