Merge pull request #15 from cjohnsonSMSH/sprints

Merge pull request #14 from cjohnsonSMSH/master