commit1

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

Conflicts:
taskcubed/main.d
taskcubed/main.o
taskcubed/menudemo.elf
commit1

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

Conflicts:
	taskcubed/main.d
	taskcubed/main.o
	taskcubed/menudemo.elf