Merge pull request #20 from youarehero/dev

merge achievements