game in progress
Fixed js conflict:
Merge branch 'master' of https://github.com/JFickel/web_flash_cards