Merge branch 'master' of github.com:adjohnson916/bowser-class