Merge pull request 'Merge pull request 'dev-base' (#17) from dev-base into dev-resouces' (#18) from dev-resouces into dev-base
Reviewed-on: http://git.euph.dev/GameDev/2DHackAndSlay/pulls/18
This commit is contained in:
commit
74e2a42b83