test fixed
Merge branch 'basic_structure' of github.com:tim-schwarz/VM-JiffyBox into basic_structure