Update changelog
Merge branch 'master' of github.com:rymo4/gunslinger