branch test
test branch
test branch master
conflict fixed
add merge
merge with no-ff
Merge branch 'master' of https://github.com/detective7th/emacs
flycheck and emacs update to 24