ugly ifs
Merge branch 'psoshnin_branch' of https://github.com/psoshnin/sifteocubes into psoshnin_branch

Conflicts:
	taskcubed/main.o