pulled in master changes
renamed card controller
removed typo from cards_controller