merge
Merge branch 'BossTest' of github.com:NintenJoe/zol into BossTest
working demo