terribly insufficient commit, because i'm leaving for the night.
Merge pull request #8 from tihuan/master

display card and check answer
Merge pull request #9 from tihuan/master

better UI integrated. Need small tweaks.
Merge pull request #1 from keaty/user-logic

User logic
combined team members' work into one branch to push to fork.
conflicts resolved
Merge pull request #11 from keaty/master

combined team members' work into one fork to push to main repo
Made additions to view and CSS files
Merge pull request #12 from reboryan/master

Made additions to view and CSS files
update english-french/spanish.txt to allow proper db:seed