initial commit (mixture)
auto commit (mixture)
merged
Merge branch 'gh-pages'