Moved hand cards back into the controller
Merge remote-tracking branch 'origin/master'