unimportant, could be stashed
merged
regular commit
regular commit
Merge branch 'gh-pages'