Merge branch 'master' of github.com:flpjck/flapjack
add CHANGELOG
Merge branch 'master' of github.com:flpjck/flapjack
update changelog