Merge branch 'master' of github.com:atleastimtrying/rubber_duck
Merge branch 'master' into gh-pages