Merge pull request #12 from cjohnsonSMSH/master

propogation
Merge pull request #13 from cjohnsonSMSH/sprints

Merge pull request #12 from cjohnsonSMSH/master