Switch it back to show a necessary merge
Merge branch 'master' of github.com:colepacak/branching