modified article flip cards
changes made to flip cards
changes made to merge
merging changes to master
Merge branch 'master'