merging
merging
merging
merging
merging
fixed flashcard css
merging