make works again
Merge branch 'master' of https://github.com/supersparks/sifteo

Conflicts:
	src/Cubes/Operator.d
	src/Cubes/Question.d
	src/Cubes/QuestionList.d
	src/Cubes/Questioner.d
	src/Cubes/Result.d
	src/Cubes/Timer.d
	src/Modes/Mode.d
	src/Modes/Normal.d
	src/Modes/PlayGame.d
	src/Operators.elf
	src/assets.gen.d
	src/main.d
Merge branch 'master' of https://github.com/supersparks/sifteo

Conflicts:
	src/Cubes/Operator.d
	src/Cubes/Question.d
	src/Cubes/Questioner.d
	src/Cubes/Timer.d
	src/Modes/Mode.d
	src/Modes/Normal.d
	src/Modes/PlayGame.d
	src/assets.gen.d
	src/main.d