Merge branch 'master' into css_design_goldfinger
Merge branch 'css_design_goldfinger'
Merge branch 'master' of https://github.com/avifoxi/GOLDFINGERhasflashcards
add additional CSS design elements, image positioning, style changes to language within slides
fixing conflicts with the merge between css_design_goldfinger and master
Merge branch 'css_design_goldfinger'
fixed merge conflicts betwen ldrboard and master