apparantly he wants to adds file #whatahorror
Merge branch 'Make-new-card-files' of https://github.com/Wouther/DominSim into Make-new-card-files

Conflicts:
	main.cpp