Cards are now drawn at the end of turns
Merge branch 'master' of https://github.com/DennyScott/rotk

Conflicts:
	app/js/states/play.js