double
Merge branch 'master' of https://github.com/Assen87/Speltest.git

Conflicts:
	main.cpp