tests
Merge branch 'master' of https://github.com/TronLovas/TRAPP

q
tests stuff
Merge branch 'master' of https://github.com/TronLovas/TRAPP