no message
Merge branch 'master' of https://github.com/supersparks/sifteo

Conflicts:
	src/Modes/Practise.d
	src/Operators.elf
	src/main.d
rules page added
fourth rules page added
Loading added to main
Merge branch 'master' of https://github.com/supersparks/sifteo

Conflicts:
	src/Operators.elf
	src/main.d
Memory issues sorted out. Can now have plenty of questions and have Normal and Practise mode both in the program
Merge branch 'master' of https://github.com/supersparks/sifteo into Teamwork

Conflicts:
	src/Cubes/QuestionList.d
	src/Cubes/Questioner.d
	src/Cubes/Result.d
	src/Cubes/Timer.d
	src/Modes/Normal.d
	src/Modes/PlayGame.d
	src/Modes/Rules.d
	src/Operators.elf
	src/assets.gen.cpp
	src/assets.gen.d
	src/assets.gen.h
	src/assets.html
	src/main.cpp
	src/main.d