edit changelog
Merge pull request #16 from goFrendiAsgard/master

edit changelog