Merge pull request #1 from SaraJo/gh-pages

Messing with iframes
more futzing with iframe
fixed merge issue