Merge pull request #54 from cgoodling/master

Update my branch
Merge pull request #55 from cgoodling/kaley

Merge pull request #54 from cgoodling/master