-finished ingame GUI
Merge branch 'feature-ingame-gui'
Merge branch 'master' of https://github.com/vinicz/potential-octo-adventure