CHUCK NORRIS and card flip, JS edits too.
Merge branch 'master' of https://github.com/fiddler-crabs-2014/flash_cards into 6.18_sat_chuck_norris

Conflicts:
	flash_cards/app/controllers/decks.rb