Push before Main view overhaul.
Merge branch 'master' of https://github.com/poloure/drunken-archer
Merge pull request #20 from Currfyg/master

Merge