Parse english-french.txt to Card database.
Merge branch 'Parse_cards' of https://github.com/fiddler-crabs-2014/g1-web-flash-cards into Parse_cards

Conflicts:
	web_flash_cards/db/seeds.rb