solve merge conflict
Merge branch 'Development' of github.com:bbsss/HUSACCT into Development
fixed bug with skippabletypes