Tests finished'ish
Merge branch 'master' of https://github.com/TronLovas/TRAPP