Changes to merge into hotfix
forgot this bit
adding another hotfix
one more
Merge branch 'master' into hotfix
Trying to figure out the difference between merging master into hotfix and rebase.
Merge branch 'hotfix' of https://github.com/jefffabiny/beee into hotfix
not sure what's going on here