commit first blog entry
add local changes
Merge remote branch 'origin/master'
merge w/ local changes