blah blah blah
Merge branch 'master' of https://github.com/nicktallents/Hanabi

Conflicts:
	ask.cpp