Merge pull request #16 from Currfyg/master

Merge
Merge pull request #17 from Currfyg/master

Merge
Wrote my own parser again.
Merge branch 'master' of https://github.com/poloure/drunken-archer