Merge pull request #1 from emmadevs/master

updated css for previews
grabbing Emma's changes
fixing conflicts
changes to script and css
it works! except for the fancybox