Bug fixes
Merge branch 'master' of https://github.com/RikoOphorst/messing-with-pixi
Convert indentation to tabs AS REQUESTED