delete comments
Merge branch 'master_new'

Conflicts:
	.DS_Store
	task3/assets.gen.cpp
	task3/assets.gen.d
	task3/assets.gen.h
	task3/assets.gen.o
	task3/assets.html
	task3/assets.lua
	task3/assets/bg.png
	task3/assets/gbar_vert.png
	task3/assets/icon.png
	task3/assets/obar_vert.png
	task3/assets/paperanimation/paper9-128.png
	task3/assets/pbar_vert.png
	task3/assets/stripes.png
	task3/assets/task1Duration.png
	task3/assets/task1Pic.png
	task3/assets/task1blue.png
	task3/assets/task1icon.png
	task3/assets/task1red.png
	task3/assets/task1yellow.png
	task3/assets/task2Duration.png
	task3/assets/task2Pic.png
	task3/assets/task2blue.png
	task3/assets/task2icon.png
	task3/assets/task2red.png
	task3/assets/task2yellow.png
	task3/assets/task3Duration.png
	task3/assets/task3Pic.png
	task3/assets/task3blue.png
	task3/assets/task3icon.png
	task3/assets/task3red.png
	task3/assets/task3yellow.png
	task3/assets/task4icon.png
	task3/main.cpp
	task3/main.d
	task3/main.o
	task3/task3.elf
	taskcubed- membrane/.DS_Store
	taskcubed- membrane/assets.gen.d
	taskcubed- membrane/assets.gen.o
	taskcubed- membrane/assets.lua
	taskcubed- membrane/cube.cpp
	taskcubed- membrane/cube.d
	taskcubed- membrane/cube.o
	taskcubed- membrane/flavor.d
	taskcubed- membrane/flavor.o
	taskcubed- membrane/game.cpp
	taskcubed- membrane/game.d
	taskcubed- membrane/game.o
	taskcubed- membrane/loader.d
	taskcubed- membrane/loader.o
	taskcubed- membrane/main.d
	taskcubed- membrane/main.o
	taskcubed- membrane/particle.d
	taskcubed- membrane/particle.o
	taskcubed- membrane/portal.d
	taskcubed- membrane/portal.o
	taskcubed- membrane/taskcubed.elf
	taskcubed- menu/dummy.png
	taskcubed- menu/orange.png
	taskcubed- menu/purple.png