Merge branch 'master' into refactor
further refactoring
....how does this happen?  I already committed this.
Committing the changes
Merge branch 'refactor'
Merge branch 'master' into refactor
Merge branch 'refactor'